Merge "Add support for xml dump schema 0.11"